Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #60877

Merged
merged 19 commits into from
May 16, 2019
Merged

Rollup of 6 pull requests #60877

merged 19 commits into from
May 16, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 16, 2019

Successful merges:

Failed merges:

r? @ghost

jsgf and others added 19 commits April 9, 2019 16:52
Allow Strings to be created from borrowed Strings. This is mostly
to make things like passing &String to an `impl Into<String>`
parameter frictionless.
LLVM will soon require 2017+ [1] (and our in-tree version just rejected the version of 2015 I was using), so update the mention and provide a link.

[1]: https://llvm.org/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library
string: implement From<&String> for String

Allow Strings to be created from borrowed Strings. This is mostly
to make things like passing `&String` to an `impl Into<String>`
parameter frictionless.

Fixes rust-lang#59827.
…teveklabnik

Fix convert module's documentation links

r? @steveklabnik
…tril

Include expression to wait for to the span of Await

Currently the span of `await!` only includes itself:

```rust
    await!(3);
//  ^^^^^
```

This PR changes it so that the span holds the whole `await!` expression:

```rust
    await!(3);
//  ^^^^^^^^^
Update rustc book CLI docs.

This adds a little detail (and missing flags) to the rustc book. There is still a lot of information missing, but this seemed like a good step to expanding it.
…crichton

README.md: Mention MSVC 2017+, not 2013(!)

LLVM will soon require 2017+ (and our in-tree version just rejected the version of 2015 I was using), so update the mention and provide a link.

Ref: https://llvm.org/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library
Move `box` from the stable keyword to unstable keywords list

Fixes rust-lang#60849
@Centril
Copy link
Contributor Author

Centril commented May 16, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented May 16, 2019

📌 Commit b59ce94 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 16, 2019
@bors
Copy link
Contributor

bors commented May 16, 2019

⌛ Testing commit b59ce94 with merge 1962ade...

bors added a commit that referenced this pull request May 16, 2019
Rollup of 6 pull requests

Successful merges:

 - #59825 (string: implement From<&String> for String)
 - #59923 (Fix convert module's documentation links)
 - #60691 (Include expression to wait for to the span of Await)
 - #60769 (Update rustc book CLI docs.)
 - #60816 (README.md: Mention MSVC 2017+, not 2013(!))
 - #60851 (Move `box` from the stable keyword to unstable keywords list)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 16, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 1962ade to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 16, 2019
@bors bors merged commit b59ce94 into rust-lang:master May 16, 2019
@Centril Centril deleted the rollup-j0o5mo5 branch May 16, 2019 13:00
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants